Work on Mac issues.
More mac fixes.