More logging fixes