Improved some logging.