Be more Py3k friendly