A few changes to the form module