Couple more minor tweaks.