fix form issues