Fixes for all the model changes