Some minor fixes in models