more tweaks for darwin port