Support and fix some datatypes