Fixing issues in data types