Fix the build problems