Fixing use of DataType.INTEGER, DOUBLE and DECIMAL.