Fixed imports for python 3