v9.14 Fixes issues with valgrind