Map related bug fixes