Fix types in models