miscellaneous fixes from the richer optional dependency stack I have on my mac