Fixes to Index