Fix deprecation warnings for 0.4 Dict change