Fixed DataTypes and NQL.g.