After windows hell... Make buildable under MacOS again.