Additional fixes to forms and etc.