BUGFIX: Indexing fixes