Fixing clang problems
(cherry picked from commit 6902216d1afa1aa1b2f7146a91a473e9452ea56d)