Small fixes in forms