Fixes for MongoDB collators