Added latest fixes from MongoYii