More fixes for models