Couple of tweaks