diff --git a/Build/Agent/FwBuildEnvironment.psm1 b/Build/Agent/FwBuildEnvironment.psm1
index 26d0e96d5a..7fd7a0f11d 100644
--- a/Build/Agent/FwBuildEnvironment.psm1
+++ b/Build/Agent/FwBuildEnvironment.psm1
@@ -724,6 +724,7 @@ Export-ModuleMember -Function @(
     'Test-VsDevEnvironmentActive',
     'Initialize-VsDevEnvironment',
 	'Test-CvtresCompatibility',
+	'Get-CvtresDiagnostics',
     'Get-MSBuildPath',
     'Invoke-MSBuild',
     'Get-VSTestPath'
diff --git a/Build/Agent/FwBuildHelpers.psm1 b/Build/Agent/FwBuildHelpers.psm1
index a4f3b23e7a..f8a972115b 100644
--- a/Build/Agent/FwBuildHelpers.psm1
+++ b/Build/Agent/FwBuildHelpers.psm1
@@ -749,6 +749,7 @@ function Convert-CoberturaPathsToRepoRelative {
 Export-ModuleMember -Function @(
 	# From FwBuildEnvironment.psm1
 	'Initialize-VsDevEnvironment',
+	'Get-VsToolchainInfo',
 	'Get-MSBuildPath',
 	'Invoke-MSBuild',
 	'Get-VSTestPath',