A couple of minor tweaks