Making more python 3 ready