diff --git a/gramps/src/Config.py b/gramps/src/Config.py
index c89aa0bb3..8c51fe946 100644
--- a/gramps/src/Config.py
+++ b/gramps/src/Config.py
@@ -50,6 +50,7 @@ import libglade
 #
 #-------------------------------------------------------------------------
 from RelLib import *
+from Date import *
 
 import Researcher
 import const
@@ -511,7 +512,7 @@ def display_preferences_box():
         item.connect("activate", on_format_toggled)
         item.show()
         date_menu.append(item)
-    date_menu.set_active(Date.get_format_code())
+    date_menu.set_active(get_format_code())
     date_option.set_menu(date_menu)
 
     date_entry = prefsTop.get_widget("date_entry_format")
diff --git a/gramps/src/ListColors.py b/gramps/src/ListColors.py
index bc545fe67..d1c8c2f30 100644
--- a/gramps/src/ListColors.py
+++ b/gramps/src/ListColors.py
@@ -54,7 +54,7 @@ class ColorList:
             else:
                 self.clist.set_background(self.index,self.evenbg)
                 self.clist.set_foreground(self.index,self.evenfg)
-            self.index = self.index + 1
+        self.index = self.index + 1
 
     def add_with_data(self,list,data):
         self.add(list)
diff --git a/gramps/src/gramps_main.py b/gramps/src/gramps_main.py
index 3cb04cedd..bf98c16eb 100755
--- a/gramps/src/gramps_main.py
+++ b/gramps/src/gramps_main.py
@@ -722,7 +722,8 @@ def update_source_after_edit(source):
 #
 #-------------------------------------------------------------------------
 def on_tools_clicked(obj):
-    Plugins.ToolPlugins(database,active_person,update_display)
+    if active_person:
+        Plugins.ToolPlugins(database,active_person,update_display)
 
 #-------------------------------------------------------------------------
 #
@@ -730,7 +731,8 @@ def on_tools_clicked(obj):
 #
 #-------------------------------------------------------------------------
 def on_reports_clicked(obj):
-    Plugins.ReportPlugins(database,active_person)
+    if active_person:
+        Plugins.ReportPlugins(database,active_person)
 
 #-------------------------------------------------------------------------
 #
@@ -1992,12 +1994,8 @@ def displayError(msg):
 #
 #
 #-------------------------------------------------------------------------
-
-import time
-
 def apply_filter():
 
-    t1 = time.time()
     people = database.getPersonMap().values()
 
     names = []
@@ -2040,8 +2038,6 @@ def apply_filter():
 
     person_list.thaw()
 
-    t2 = time.time()
-    print "apply",t2-t1
     if i > 0:
         goto_active_person()
 
diff --git a/gramps/src/locale/sv/LC_MESSAGES/gramps.mo b/gramps/src/locale/sv/LC_MESSAGES/gramps.mo
index de30d3338..b481c4a5c 100644
Binary files a/gramps/src/locale/sv/LC_MESSAGES/gramps.mo and b/gramps/src/locale/sv/LC_MESSAGES/gramps.mo differ
diff --git a/gramps/src/plugins/AncestorChart.py b/gramps/src/plugins/AncestorChart.py
index 9015cbcb3..f01db8f59 100644
--- a/gramps/src/plugins/AncestorChart.py
+++ b/gramps/src/plugins/AncestorChart.py
@@ -178,7 +178,7 @@ class AncestorReport:
 	width = 0
         self.filter(self.start,1)
 
-	self.height = self.lines*pt2cm(1.2*self.font.get_size())
+	self.height = self.lines*pt2cm(1.25*self.font.get_size())
 	self.box_width = pt2cm(self.box_width+20)
 
         start = self.doc.get_right_margin()