Fixing warnings for on_model_change