Fixed build problems.