Some bug fixes about map