Fix after improvements to DataView