Improved MacOS support significantly.