Logging tweaks