Various minor tweaks.