Mongoose + fixes