Merge for fixing Mac issues....