More fixes to logging.