Minor changes to indexes