Fixed a few quirks in the form engine