Fix CR build for Mac