Fix datatype methods