small bug fixes post NewModelClass