Some more fixes in model