Fix a few more .iteritems() calls