dataset fixes