Python 3 fix, Packaging fix.