Remove build errors (2/2)