More tweaks

I've added a few things to help with my OSX builds.