BUG FIX: two fixes related to DataArray math