Fixed map issues