Fixed the Build Issues