Fix two more valgrind complaints