A few final tweaks.