extra/valgrind: more fixes