diff --git a/src/agent/github/build-agent.ts b/src/agent/github/build-agent.ts
index c7bbb05..9eac77f 100644
--- a/src/agent/github/build-agent.ts
+++ b/src/agent/github/build-agent.ts
@@ -128,24 +128,12 @@ class BuildAgent implements IBuildAgent {
 
     public async exec(exec: string, args: string[]): Promise<IExecResult> {
         const dotnetPath = await io.which(exec, true)
-        let resultCode = 0
-        let stdout = ''
-        let stderr = ''
-        resultCode = await exe.exec(`"${dotnetPath}"`, args, {
-            listeners: {
-                stderr: (data: Buffer) => {
-                    stderr += data.toString()
-                },
-                stdout: (data: Buffer) => {
-                    stdout += data.toString()
-                }
-            }
-        })
+        let result = await exe.getExecOutput(`"${dotnetPath}"`, args);
         return {
-            code: resultCode,
+            code: result.exitCode,
             error: null,
-            stderr,
-            stdout
+            stderr: result.stderr,
+            stdout: result.stdout
         }
     }
 
diff --git a/src/core/dotnet-tool.ts b/src/core/dotnet-tool.ts
index 51b97c0..823b868 100644
--- a/src/core/dotnet-tool.ts
+++ b/src/core/dotnet-tool.ts
@@ -19,7 +19,7 @@ export class DotnetTool implements IDotnetTool {
     protected versionManager: IVersionManager
     private httpClient: http.HttpClient
 
-    private static readonly nugetRoot: string = 'https://azuresearch-usnc.nuget.org/'
+    private static readonly nugetRoot: string = 'https://azuresearch-usnc.nuget.org/query'
 
     constructor(@inject(TYPES.IBuildAgent) buildAgent: IBuildAgent, @inject(TYPES.IVersionManager) versionManager: IVersionManager) {
         this.buildAgent = buildAgent
@@ -116,7 +116,7 @@ export class DotnetTool implements IDotnetTool {
 
         const toolNameParam = encodeURIComponent(toolName.toLowerCase())
         const prereleaseParam = includePrerelease ? 'true' : 'false'
-        const downloadPath = `${DotnetTool.nugetRoot}query?q=${toolNameParam}&prerelease=${prereleaseParam}&semVerLevel=2.0.0&take=1`
+        const downloadPath = `${DotnetTool.nugetRoot}?q=${toolNameParam}&prerelease=${prereleaseParam}&semVerLevel=2.0.0&take=1`
 
         const res = await this.httpClient.get(downloadPath)