Merge "Fix indices in fuzzer." into main