Correct build errors