Several changes

Several changes and bug-fixes in data type conversion classes