Python 3 fixes - requires six package
simple python 2to3 fixes'