Fixes on new model