various OSX tweaks for getting it to build on my system again.