More tweaks from logging