Response map fixes