Fixes in index