Fixes to Feature form