Changes for MacOSX environment