Logging fixes...