Minor updates to forms