Fixes in the model