Compatibility changes for latest DataViews commits