Trying to fix build and diagnose diff creation issue.