Tidy-up of index and compiler and major version bump