Some final tweaks.