More MacOS changes, seems to work well...