Fixes in form