reg-form fixes