Model fixes
Minor submission fixes