[PATCH v2 0/2] Some fixes for valgrind suppressions