fixes for datasets