More logging adjustments