Improve Mac Os X support.