Tweaks around the logger