More Mac OS dependency fixes.