Logging fixes.