Various form fixes and cleanups