Minor fixes for the form, hoping to fix browser save errors