Hotfixes to the forms