More os.x changes