Fixes in data types conversion...