Pull a couple more changes from PythonImproved