Fix OSX downstream projects