a few map fixes