More int versus Index fixes