removed Clang warnings
removed more Clang warnings