python3 build fixes
python3 build fixes