Updates for OSX usage
More adjustments for OSX