remove more bugs found by clang