BUG-6522: Adjust collection sizes