Darwin fixes, round 1