Tweaks to form module