Mongoose fixes