More logging enhancements.