more improvements to new logging, found during pre PR