Fix build problems.