Fix the dict related warnings