Mongo fixes