Final review tweaks