fix clang -Wall warnings (amend)