Fixed the broken build issues