Minor fixes.
Fixed an import to work on Python 3.
Fixed some packaging related issues.