Some small fixes in the model.