Arr class fixes