6.2.0 Fixes

Minor changes to datatypes and dictionary imports for 6.2.0