WIP more python3 support