A couple of Python 3 fixes.