More Logging fixes