Fixes to msan/asan configuration