Clean up build errors