Tweak setup procedure