Properly fix build errors.