Use PrependUnique instead of Prepend in a couple more places
Another attempt at fixing the Mac dependency issue