Final comments tweaks