Bug Fixes in for Clang Compile