Make some final tweaks