Fix Py3K, last pre-release updates