FIX: Py3k fixes