Fixes in the generated dataset logic.