Various form fixes