expectancy map fixes