Fix import statements for Py3