Small final tweaks