Improve Darwin support