* Added minor changes for clang