In Dataset: Fix bugs.