A handful of minor tweaks