Fix form issues