datasets fixes