Just a couple of minor tweaks