Fixing up some issues with the datatype.