Fix bugs and overrides in forms