Even moar Valgrind fixes