Fixes for freeze_model