Fixing OS X specific issues.