Merge "Changed maximumEntries to correct int rather than long"