Fixes for clang warnings
Fixes for clang warnings