Finish python 3 support