Minor fixes to indexes