Fixed import errors for Python3