Corrected the build issues