Minor fixes in form