Updates for OS X and docs