Update dataset support.
Tiny fixes.