Get rid of Dict deprecation warnings