Small fixes to support full project loading with MongoDatastore2