[Build] Corrected Build Errors