Fixes small issues with model.