Fixed maps a bit