diff --git a/kiwi/boot/image/base.py b/kiwi/boot/image/base.py
index 8425a5c5..b97a5549 100644
--- a/kiwi/boot/image/base.py
+++ b/kiwi/boot/image/base.py
@@ -92,9 +92,11 @@ class BootImageBase(object):
         """
         raise NotImplementedError
 
-    def create_initrd(self):
+    def create_initrd(self, mbrid=None):
         """
         Implements creation of the initrd
+
+        :param object mbrid: instance of ImageIdentifier
         """
         raise NotImplementedError
 
diff --git a/kiwi/boot/image/dracut.py b/kiwi/boot/image/dracut.py
index 207b3d14..bd75c71c 100644
--- a/kiwi/boot/image/dracut.py
+++ b/kiwi/boot/image/dracut.py
@@ -76,6 +76,8 @@ class BootImageDracut(BootImageBase):
     def create_initrd(self, mbrid=None):
         """
         Call dracut to create the initrd and XZ compress the result
+
+        :param object mbrid: unused
         """
         if self.is_prepared():
             log.info('Creating generic dracut initrd archive')
diff --git a/kiwi/boot/image/kiwi.py b/kiwi/boot/image/kiwi.py
index d3bf68b2..e7704c60 100644
--- a/kiwi/boot/image/kiwi.py
+++ b/kiwi/boot/image/kiwi.py
@@ -85,6 +85,8 @@ class BootImageKiwi(BootImageBase):
     def create_initrd(self, mbrid=None):
         """
         Create initrd from prepared boot system tree and compress the result
+
+        :param object mbrid: instance of ImageIdentifier
         """
         if self.is_prepared():
             log.info('Creating initrd cpio archive')
diff --git a/kiwi/bootloader/config/grub2.py b/kiwi/bootloader/config/grub2.py
index af0e76e1..da8ebf93 100644
--- a/kiwi/bootloader/config/grub2.py
+++ b/kiwi/bootloader/config/grub2.py
@@ -508,9 +508,9 @@ class BootLoaderConfigGrub2(BootLoaderConfigBase):
                     options=['-z', '-a']
                 )
 
-        self._check_boot_theme_exists(lookup_path)
+        self._check_boot_theme_exists()
 
-    def _check_boot_theme_exists(self, lookup_path):
+    def _check_boot_theme_exists(self):
         if self.theme:
             theme_dir = os.sep.join(
                 [
diff --git a/kiwi/filesystem/isofs.py b/kiwi/filesystem/isofs.py
index 7a683ac1..5ac3848d 100644
--- a/kiwi/filesystem/isofs.py
+++ b/kiwi/filesystem/isofs.py
@@ -25,7 +25,7 @@ class FileSystemIsoFs(FileSystemBase):
     """
     Implements creation of iso filesystem
     """
-    def create_on_file(self, filename, label=None):
+    def create_on_file(self, filename, label=None, exclude=None):
         """
         Create iso filesystem from data tree
 
@@ -34,6 +34,7 @@ class FileSystemIsoFs(FileSystemBase):
 
         :param string filename: result file path name
         :param string label: unused
+        :param string exclude: unused
         """
         iso = Iso(self.root_dir)
         iso.init_iso_creation_parameters(
diff --git a/kiwi/kiwi_compat.py b/kiwi/kiwi_compat.py
index 65f22a91..afc16f5d 100644
--- a/kiwi/kiwi_compat.py
+++ b/kiwi/kiwi_compat.py
@@ -198,6 +198,6 @@ def main():
         # logging.info('Calling: kiwi %s', ' '.join(arguments.translated))
         Command.execute(arguments.translated)
     except NotImplementedError as e:
-        logging.error('KiwiCompatError: %s' % format(e))
+        logging.error('KiwiCompatError: %s', format(e))
     except OSError as e:
-        logging.error('KiwiCompatError: %s' % format(e))
+        logging.error('KiwiCompatError: %s', format(e))