map reader fixes