Tweaking form handling