Fixed form issues