Fixes to bug with novalidate