More fixes in model