Valgrind seems to be happy now :)