Tweaks for Python 3 compatibility