Fixes to index