a couple of minor tweaks