diff --git a/modules.json b/modules.json
index c8786231..4e41c5ef 100644
--- a/modules.json
+++ b/modules.json
@@ -68,7 +68,7 @@
                     },
                     "samtools/flagstat": {
                         "branch": "master",
-                        "git_sha": "b13f07be4c508d6ff6312d354d09f2493243e208",
+                        "git_sha": "2d20463181b1c38981a02e90d3084b5f9fa8d540",
                         "installed_by": ["modules"]
                     },
                     "samtools/index": {
@@ -78,7 +78,7 @@
                     },
                     "samtools/view": {
                         "branch": "master",
-                        "git_sha": "669eb24fd82a9d3cb18ad0e73673ecb26827f683",
+                        "git_sha": "2d20463181b1c38981a02e90d3084b5f9fa8d540",
                         "installed_by": ["modules"],
                         "patch": "modules/nf-core/samtools/view/samtools-view.diff"
                     },
diff --git a/modules/nf-core/samtools/flagstat/main.nf b/modules/nf-core/samtools/flagstat/main.nf
index 4a499727..c23f3a5c 100644
--- a/modules/nf-core/samtools/flagstat/main.nf
+++ b/modules/nf-core/samtools/flagstat/main.nf
@@ -18,7 +18,6 @@ process SAMTOOLS_FLAGSTAT {
     task.ext.when == null || task.ext.when
 
     script:
-    def args = task.ext.args ?: ''
     def prefix = task.ext.prefix ?: "${meta.id}"
     """
     samtools \\
diff --git a/modules/nf-core/samtools/view/main.nf b/modules/nf-core/samtools/view/main.nf
index 37e05cec..4f69a94b 100644
--- a/modules/nf-core/samtools/view/main.nf
+++ b/modules/nf-core/samtools/view/main.nf
@@ -63,7 +63,7 @@ process SAMTOOLS_VIEW {
                 input.getExtension()
     if ("$input" == "${prefix}.${file_type}") error "Input and output names are the same, use \"task.ext.prefix\" to disambiguate!"
 
-    def index = args.contains("--write-index") ? "touch ${prefix}.${file_type}.csi" : ""
+    index = args.contains("--write-index") ? "touch ${prefix}.${file_type}.csi" : ""
 
     """
     touch ${prefix}.${file_type}
diff --git a/modules/nf-core/samtools/view/samtools-view.diff b/modules/nf-core/samtools/view/samtools-view.diff
index d5c13034..fb47ba9a 100644
--- a/modules/nf-core/samtools/view/samtools-view.diff
+++ b/modules/nf-core/samtools/view/samtools-view.diff
@@ -6,7 +6,7 @@ Changes in module 'nf-core/samtools/view'
      conda "${moduleDir}/environment.yml"
      container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
 -        'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/9e/9edc2564215d5cd137a8b25ca8a311600987186d406b092022444adf3c4447f7/data' :
--        'community​.wave​.seqera​.io/library/htslib_samtools:1​.21--6cb89bfd40cbaabf' }"
+-        'community.wave.seqera.io/library/htslib_samtools:1.21--6cb89bfd40cbaabf' }"
 +        'https://depot.galaxyproject.org/singularity/samtools:1.21--h50ea8bc_0' :
 +        'biocontainers/samtools:1.21--h50ea8bc_0' }"