OS X and Linux build updates