Array2D fixes