Minor amendments to form fields