fixes in form handlers