Updated for Mac OS changes

Still testing on other Linux variations