fixes for form