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