Two minor tweaks