Fixed a couple of index and IndexRule regressions