Fix Model callbacks