Better python3 support