Changes corresponding to setup for MacOSX.