Readded Mac integration

(Doesn't crash on Windows anymore!)