diff --git a/ChangeLog b/ChangeLog
index 55d1cfc4f..10583fbbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-07 Raphael Ackermann <raphael.ackermann@gmail.com
+	* src/plugins/EventCmp.py: clean up imports and fix pylint error
+	0001496: in EventCmp.py: E:198:fix: Using variable 'l' before assignment
+
 2008-01-07 Raphael Ackermann <raphael.ackermann@gmail.com
 	* src/plugins/CmdRef.py: clean up unused and broken imports and vars
 	0001494: unresolved import WebPage in CmdRef.py
diff --git a/src/plugins/EventCmp.py b/src/plugins/EventCmp.py
index 2e0683288..db8b01a93 100644
--- a/src/plugins/EventCmp.py
+++ b/src/plugins/EventCmp.py
@@ -36,7 +36,6 @@ from gettext import gettext as _
 # GNOME/GTK modules
 #
 #------------------------------------------------------------------------
-import gtk
 import gtk.glade
 
 #------------------------------------------------------------------------
@@ -47,7 +46,7 @@ import gtk.glade
 from Filters import GenericFilter, build_filter_menu, Rules
 import Sort
 import Utils
-import ODSTab
+from docgen import ODSTab
 import const
 import Errors
 import DateHandler
@@ -195,7 +194,7 @@ def by_value(first,second):
 #
 #-------------------------------------------------------------------------
 def fix(line):
-    l = line.strip().replace('&','&amp;').replace(l,'>','&gt;')
+    l = line.strip().replace('&','&amp;').replace('>','&gt;')
     return l.replace(l,'<','&lt;').replace(l,'"','&quot;')
 
 #-------------------------------------------------------------------------
@@ -320,7 +319,8 @@ class DisplayChart(ManagedWindow.ManagedWindow):
                                        event.get_date_object().get_sort_value()
                             place_handle = event.get_place_handle()
                             if place_handle:
-                                place = self.db.get_place_from_handle(place_handle).get_title()
+                                place = self.db. \
+                                get_place_from_handle(place_handle).get_title()
                         tlist.append(date)
                         tlist.append(sortdate)
                         tlist.append(place)