Attempt to fix some OSX bootstrap problems

I have no idea what's going on here...