Misc form tweaks