Tweaks for better logging.