Fixes in sanitizer