Updates to make Mandel compile on Osx latest