A couple of final tweaks