Some more logging tweaks.