Fixed imports under Py3k