Fixes in forms