Logging tweaks and additions