Couple of minor tweaks