Added map changes for issues #655 and #839