Model fixes
Merge