Fixes to form component