A few more minor tweaks.