Map related bug fixes.