More logging-related tweaks