Py3k: missed some big stuff apparently