More fixes for ultra pedantic Clang -Weverything