Fix a few more '{}'.format calls so they work properly on py2.6