Minor logging improvement
More logging improvemnts