Trivial clang fixes
Merge branch 'fixing_722'