Some more minor changes for the upcoming L4.1
More form management work