Logging improvements.