Updates for OS X setup