Index updates and fix