Fix problems found in Logging 2.0 code from last commit