Model fixes etc.