diff --git a/spkl/SparkleXrm.Tasks/DirectoryInfoEx.cs b/spkl/SparkleXrm.Tasks/DirectoryInfoEx.cs
index ce01b57..4f614cf 100644
--- a/spkl/SparkleXrm.Tasks/DirectoryInfoEx.cs
+++ b/spkl/SparkleXrm.Tasks/DirectoryInfoEx.cs
@@ -39,13 +39,14 @@ public string SimpleSearch(string path, string search)
         public List<string> Search(string path, string search)
         {
             var matcher = new Matcher(StringComparison.InvariantCultureIgnoreCase);
+            matcher.AddExclude("packages");
             if (search.StartsWith("..") || search.StartsWith("**") || search.StartsWith("\\"))
             {
                 matcher.AddInclude(search);
             }
             else
             {
-                matcher.AddInclude("**\\" + search);
+                matcher.AddIncludePatterns(search.Split('|').Select(s => "**\\" + s).ToArray());
             }
             
             var globbMatch = matcher.Execute(new DirectoryInfoWrapper(new DirectoryInfo(path)));
diff --git a/spkl/SparkleXrm.Tasks/Tasks/DownloadPluginMetadataTask.cs b/spkl/SparkleXrm.Tasks/Tasks/DownloadPluginMetadataTask.cs
index 6336a94..387a297 100644
--- a/spkl/SparkleXrm.Tasks/Tasks/DownloadPluginMetadataTask.cs
+++ b/spkl/SparkleXrm.Tasks/Tasks/DownloadPluginMetadataTask.cs
@@ -187,7 +187,10 @@ private void AddPluginAttributes(OrganizationServiceContext ctx, CodeParser pars
                             )
                         {
                             Id = step.Id.ToString(),
-                            DeleteAsyncOperation = step.Mode.Value != 0 && step.AsyncAutoDelete.Value,
+                            DeleteAsyncOperation = 
+                                step.Mode.Value !=  sdkmessageprocessingstep_mode.Synchronous && 
+                                                    step.AsyncAutoDelete.HasValue && 
+                                                    step.AsyncAutoDelete.Value
                         };
                     }
 
diff --git a/spkl/SparkleXrm.Tasks/Tasks/DownloadWebresourceConfigTask.cs b/spkl/SparkleXrm.Tasks/Tasks/DownloadWebresourceConfigTask.cs
index 9f1b8ca..5bb02b2 100644
--- a/spkl/SparkleXrm.Tasks/Tasks/DownloadWebresourceConfigTask.cs
+++ b/spkl/SparkleXrm.Tasks/Tasks/DownloadWebresourceConfigTask.cs
@@ -66,7 +66,7 @@ protected override void ExecuteInternal(string filePath, OrganizationServiceCont
                 }
             }
 
-            var webresources = ServiceLocator.DirectoryService.Search(filePath, "*.js|*.htm|*.css|*.xap|*.png|*.jpeg|*.jpg|*.gif|*.ico|*.xml");
+            var webresources = ServiceLocator.DirectoryService.Search(filePath, "*.js|*.htm*|*.css|*.xap|*.png|*.jpeg|*.jpg|*.gif|*.ico|*.xml");
 
             if (webresources == null)
                 throw new SparkleTaskException(SparkleTaskException.ExceptionTypes.NO_WEBRESOURCES_FOUND, $"No webresources found in the folder '{filePath}'");