Tweak formspec code