Modifications to ensure python2.6 compatibility