diff --git a/BuildTasks/BuildManifest.Task.ps1 b/BuildTasks/BuildManifest.Task.ps1
index 755d3f1..7f6f286 100644
--- a/BuildTasks/BuildManifest.Task.ps1
+++ b/BuildTasks/BuildManifest.Task.ps1
@@ -30,10 +30,13 @@ taskx BuildManifest @{
         {
             foreach ($parameter in $command.Parameters.Keys)
             {
+                if($false -eq $command.Parameters[$parameter].IsDynamic)
+                {
                 '{0}:{1}' -f $command.Name, $command.Parameters[$parameter].Name
                 foreach ($alias in $command.Parameters[$parameter].Aliases)
                 {
                     '{0}:{1}' -f $command.Name, $alias
+                    }
                 }
             }
         }
diff --git a/BuildTasks/ImportDevModule.Task.ps1 b/BuildTasks/ImportDevModule.Task.ps1
index f4271fc..c852471 100644
--- a/BuildTasks/ImportDevModule.Task.ps1
+++ b/BuildTasks/ImportDevModule.Task.ps1
@@ -8,10 +8,11 @@ task ImportDevModule {
     }
     else
     {
-        if (Get-Module -Name $ModuleName)
+        $loaded = Get-Module -Name $ModuleName -All
+        if ($loaded)
         {
             "Unloading Module [$ModuleName] from a previous import..."
-            Remove-Module -Name $ModuleName
+            $loaded | Remove-Module -Force
         }
 
         "Importing Module [$ModuleName] from [$Source\$ModuleName.psd1]..."
diff --git a/BuildTasks/ImportModule.Task.ps1 b/BuildTasks/ImportModule.Task.ps1
index 1017e6b..dfe72c6 100644
--- a/BuildTasks/ImportModule.Task.ps1
+++ b/BuildTasks/ImportModule.Task.ps1
@@ -7,10 +7,11 @@ task ImportModule {
     }
     else
     {
-        if (Get-Module -Name $ModuleName)
+        $loaded = Get-Module -Name $ModuleName -All
+        if ($loaded)
         {
             "Unloading Module [$ModuleName] from a previous import..."
-            Remove-Module -Name $ModuleName
+            $loaded | Remove-Module -Force
         }
 
         "Importing Module [$ModuleName] from [$ManifestPath]..."