Additional model hot fixes
Merge pull request #3 from MadeByDiesel/development

Additional model hot fixes