Fixes For Clang Compile