index class fixes