Fixes to rendered forms