Various form cleanups