Fixed the build errors