Fix map types detection