Fix handling of Dict's