Fix some models

Merged Dmitry Lukhtionov requested to merge fix_models_2 into master

Merge request reports