More Py3K Fixes.