More minor logging tweaks