Fix problems for build.