Fix a few more warnings on the logging branch.