Fix up build errors