Form tweaks and hardening