Compatability fixes for Python 2.6 and 3.x