MAC OS fixes