Added clang modifications for proper build