Fix the types passed through the map