Better Darwin support