diff --git a/tools/hooks/dmi.merge b/tools/hooks/dmi.merge
old mode 100644
new mode 100755
diff --git a/tools/hooks/pre-commit.hook b/tools/hooks/pre-commit.hook
old mode 100644
new mode 100755
diff --git a/tools/mapmerge2/dmi.py b/tools/mapmerge2/dmi.py
index f0a8182c9f0..7e1c75cf8d5 100644
--- a/tools/mapmerge2/dmi.py
+++ b/tools/mapmerge2/dmi.py
@@ -45,6 +45,8 @@ class Dmi:
     @classmethod
     def from_file(cls, fname):
         image = Image.open(fname)
+        if image.mode != 'RGBA':
+            image = image.convert('RGBA')
 
         # no metadata = regular image file
         if 'Description' not in image.info: