More form related fixes