fix up some targeted build bugs