FIX: Py3k on Linux fixes