diff --git a/terminatorlib/container.py b/terminatorlib/container.py
index 8f1f598c..111748e7 100755
--- a/terminatorlib/container.py
+++ b/terminatorlib/container.py
@@ -61,10 +61,6 @@ class Container(object):
         """Default axis splitter. This should be implemented by subclasses"""
         raise NotImplementedError('split_axis')
 
-    def unsplit(self, widget, keep=False):
-        """Default unsplitter. This should be implemented by subclasses"""
-        raise NotImplementedError('unsplit')
-
     def add(self, widget):
         """Add a widget to the container"""
         raise NotImplementedError('add')
diff --git a/terminatorlib/paned.py b/terminatorlib/paned.py
index fcc1af31..82ff697e 100755
--- a/terminatorlib/paned.py
+++ b/terminatorlib/paned.py
@@ -12,6 +12,7 @@ from terminal import Terminal
 from container import Container
 
 # pylint: disable-msg=R0921
+# pylint: disable-msg=E1101
 class Paned(Container):
     """Base class for Paned Containers"""
     cnxids = None
@@ -29,6 +30,7 @@ class Paned(Container):
         gobject.type_register(HPaned)
         self.register_signals(HPaned)
 
+    # pylint: disable-msg=W0613
     def set_initial_position(self, widget, event):
         """Set the initial position of the widget"""
         if isinstance(self, gtk.VPaned):
@@ -41,6 +43,7 @@ class Paned(Container):
         self.disconnect(self.cnxids['init'])
         del(self.cnxids['init'])
 
+    # pylint: disable-msg=W0613
     def split_axis(self, widget, vertical=True):
         """Default axis splitter. This should be implemented by subclasses"""
         self.remove(widget)
diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py
index 88fff44b..58b4e73d 100755
--- a/terminatorlib/terminal.py
+++ b/terminatorlib/terminal.py
@@ -47,7 +47,8 @@ class Terminal(gtk.VBox):
         'tab-new': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
         'tab-top-new': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
         'focus-in': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
-        'zoom': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
+        'zoom': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, 
+            (gobject.TYPE_BOOL,)),
         'maximise': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
         'resize-term': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
             (gobject.TYPE_STRING,)),
diff --git a/terminatorlib/window.py b/terminatorlib/window.py
index 1d86f7c3..f29f5c8c 100755
--- a/terminatorlib/window.py
+++ b/terminatorlib/window.py
@@ -13,7 +13,7 @@ from version import APP_NAME
 from container import Container
 from newterminator import Terminator
 from terminal import Terminal
-from paned import HPaned,VPaned
+from paned import HPaned, VPaned
 
 try:
     import deskbar.core.keybinder as bindkey