Fix fallout of requiring uint indices