Python 2.6 fix and url changes