Fixed issues with model changes.