Various minor tweaks