More clang fixes

Is this thing on?