mods to avoid valgrind output/check-err in checks
Merge branch '19-mods' into 20