Some more form changes