Fix maps cmd bugs