Fix compile errors. How on earth did clang let this through?