Fixed the build problems