Get rid of a few more Valgrind errors.