Fixes for models