A few final tweaks