few fixes that were missed for darwin