MacOS fix and Fullscreen fix