some subindex fixes