more logging-related fixes