MBug fixes for ModelModel refactor.