Fix up row types and item indexes