Fixing known issues with model creation