logging tweaks - port from conjuro branch