More form() fixes