Tweaks for Python 3.4