Fixing some models