More model fixes
Merge branch 'master' of https://github.com/eppic-team/eppic