Setup.py fixes; still attempting build on Mac/Windows