tweaks for the Python 3 hipster