Fix stuff for darwin