forms fixes