Fix a few Index to int buggy conversions
7 files changed