Fixed some old *Map to indexedMap