Model fixes for Mongo IDs