Fixed the build issues