Fixes to ngModel + submit flags