Hopefully improved logging.