Fixes to index updating