Mac changes for install/package targets (not used yet, but should fix nightly build)