Fixed some issues with mappings of old marker types to new markers