Several minor tweaks.