Whew!
Fixed clang compilation errors.