More Python3 support