Various logging tweaks