Fixed some indicator columns and Dataset columns