Just a couple of tweaks