A couple of tweaks