Improved discrepancies between python 2 and 3