Fix a few minor issues regarding collections