fix up build errors