Three more tweaks for Python 3