Continue fixing the python 2/3 mismatch