More python3 support