More tweaks to logging