Fixed Mac even more and unbroken stuff