repair missing and improper TOSMake calls