Some logging tweaks.
More logging tweaks.