more fixes from clang suggestions