[1.2.4] Fix valgrind errors