Fix Python 3.x incompatibilites