Some more DataArrays fixes