More final tweaks