Work on python 3 support