Logging fixes

zzzz