Mac OS oriented changes