A bunch of minor tweaks