Further indexing fixes - WIP