Additional Fixes for several Data-Types