Py3k compatability changes