Logging-related fixes/updates