Tweaks in form wrapper