Fixes for new model.