Fix some issues with the form widget