More fixes to allow for simple index