While I'm here - fix logging.