Fixes for clang warnings