Fix a couple more clang build errors.