Fix clang error and some warnings
Merge branch 'master' into develop