Fixed imports for Python 3