More fixes for multiple datasets with None Datasets.