Clean some more valgrind errors