Fixed some issues with indexing