initial fix for clang warnings