Fixes to indices