Few fixes.
Support Python3