Fix some of the model dependencies