Minor fixes to index