More improvements to logging.