Additional fixes for logging