Fixes for index