More logging related changes