Fix valgrind builder maps