shutdown tweaks, back to Valgrind