8159495: Fix Index Offsets

Reviewed-by: flar, serb, mschoene
4 files changed