More OSX fixing, almost there
OSX working nicely :)