a few more tweaks to deal with building on darwin