Attempt to fix build problems.