More tweaks to logging.