darwin-head-build-fixes-20020821