diff --git a/.appveyor.yml b/.appveyor.yml
index aad30868..c981a6ab 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,7 +25,7 @@ environment:
 
 init:
   - git config --global core.autocrlf input
-  - where bash & where cat & where chmod & where cmp & where cp & where curl & where date & where file & where git & where gzip & where mkdir & where mv & where openssl & where readlink & where rm & where rmdir & where sed & where sha256sum & where sort & where ssh & where ssh-add & where ssh-agent & where ssh-keyscan & where tar
+  - where bash & where cat & where chmod & where cmp & where cp & where curl & where date & where file & where git & where gzip & where mkdir & where mv & where openssl & where readlink & where rm & where rmdir & where sed & where sha256sum & where sort & where ssh & where ssh-add & where ssh-agent & where ssh-keyscan & where tar & where touch
 # - bash --version & git --version & sed --version & tar --version
   - git --version & bash --version
 # - dir "c:\Program Files\Git\usr\bin"
diff --git a/src/linker.cpp b/src/linker.cpp
index 6277d581..07cbc2c5 100644
--- a/src/linker.cpp
+++ b/src/linker.cpp
@@ -641,8 +641,7 @@ void ElfLinkerArmLE::relocate1(const Relocation *rel, upx_byte *location, upx_ui
 }
 
 void ElfLinkerArm64LE::relocate1(const Relocation *rel, upx_byte *location, upx_uint64_t value,
-                                 const char *type)
-{
+                                 const char *type) {
     if (strncmp(type, "R_AARCH64_", 10))
         return super::relocate1(rel, location, value, type);
     type += 10;
diff --git a/src/packhead.cpp b/src/packhead.cpp
index f508e946..88946768 100644
--- a/src/packhead.cpp
+++ b/src/packhead.cpp
@@ -182,8 +182,8 @@ bool PackHeader::fillPackHeader(const upx_bytep buf, int blen) {
     filter_cto = 0;
 
     if (opt->debug.debug_level) {
-        fprintf(stderr, "  fillPackHeader  version=%d  format=%d  method=%d  level=%d\n",
-            version, format, method, level);
+        fprintf(stderr, "  fillPackHeader  version=%d  format=%d  method=%d  level=%d\n", version,
+                format, method, level);
     }
     const int size = getPackHeaderSize();
     if (boff + size <= 0 || boff + size > blen)
diff --git a/src/packmast.cpp b/src/packmast.cpp
index ad9319be..b4aa4ed5 100644
--- a/src/packmast.cpp
+++ b/src/packmast.cpp
@@ -137,14 +137,14 @@ Packer *PackMaster::visitAllPackers(visit_func_t func, InputFile *f, const optio
                                     void *user) {
     Packer *p = NULL;
 
-#define D(Klass)                                                               \
-    ACC_BLOCK_BEGIN                                                            \
-    Klass *const kp = new Klass(f);                                            \
-    if (o->debug.debug_level)                                                  \
-        fprintf(stderr, "visitAllPackers: (ver=%d, fmt=%3d) %s\n",             \
-            kp->getVersion(), kp->getFormat(), #Klass);                        \
-    if ((p = func(kp, user)))                                                  \
-        return p;                                                              \
+#define D(Klass)                                                                                   \
+    ACC_BLOCK_BEGIN                                                                                \
+    Klass *const kp = new Klass(f);                                                                \
+    if (o->debug.debug_level)                                                                      \
+        fprintf(stderr, "visitAllPackers: (ver=%d, fmt=%3d) %s\n", kp->getVersion(),               \
+                kp->getFormat(), #Klass);                                                          \
+    if ((p = func(kp, user)) != NULL)                                                              \
+        return p;                                                                                  \
     ACC_BLOCK_END
 
     // note: order of tries is important !