Fix up build