diff --git a/product/ERP5Form/Selection.py b/product/ERP5Form/Selection.py
index e9404a02d10745758ec96bb47b96aa3057be36b2..eb7f3f3bd99c54529a4c616f6eebf0f7bf4f0e86 100644
--- a/product/ERP5Form/Selection.py
+++ b/product/ERP5Form/Selection.py
@@ -190,7 +190,7 @@ class Selection(Acquisition.Implicit, Traversable, Persistent):
         if len(sort_on) > 0:
           kw['sort_on'] = sort_on
         elif kw.has_key('sort_on'):
-          del kw.params['sort_on']
+          del kw.params['sort_on'] # XXX JPS: Should this be really deleted ?
         if method is not None:
           if callable(method):
             if self.domain is not None and self.report is not None:
@@ -428,7 +428,7 @@ class DomainSelection(Acquisition.Implicit, Traversable, Persistent):
 
       if k == 'parent':
         # Special treatment for parent
-        select_expression.append(d.getParentSqlExpression(table='catalog', 
+        select_expression.append(d.getParentSQLExpression(table='catalog',
                                strict_membership=strict_membership))
       elif k is not None:
         if getattr(aq_base(d), 'isPredicate', 0):
@@ -438,7 +438,7 @@ class DomainSelection(Acquisition.Implicit, Traversable, Persistent):
           # This is a category, we must join
           select_expression.append('%s.%s = %s_category.uid' % \
                                 (join_table, join_column, k))
-          select_expression.append(d.asSQLExpression(table='%s_category' % k, 
+          select_expression.append(d.asSQLExpression(table='%s_category' % k,
                                 base_category=k,
                                 strict_membership=strict_membership))
                                 # XXX We should take into account k explicitely
@@ -447,7 +447,7 @@ class DomainSelection(Acquisition.Implicit, Traversable, Persistent):
       result = "( %s )" % ' AND '.join(select_expression)
     else:
       result = ''
-    #LOG('DomainSelection', 0, 'asSQLExpression returns %r' % (result,))      
+    #LOG('DomainSelection', 0, 'asSQLExpression returns %r' % (result,))
     return result
 
   security.declarePublic('asSQLJoinExpression')
diff --git a/product/ERP5OOo/tests/testDms.py b/product/ERP5OOo/tests/testDms.py
index 36c76a9083c90312f992ca4a99c2de38db8ba70d..bfcc955733f5d87d2f6fe9a08f7bae41ccd0ac68 100644
--- a/product/ERP5OOo/tests/testDms.py
+++ b/product/ERP5OOo/tests/testDms.py
@@ -128,7 +128,7 @@ class TestDocument(ERP5TypeTestCase):
     self.failUnless(self.getCategoryTool()!=None)
     self.failUnless(self.getSimulationTool()!=None)
     self.failUnless(self.getTypeTool()!=None)
-    self.failUnless(self.getSqlConnection()!=None)
+    self.failUnless(self.getSQLConnection()!=None)
     self.failUnless(self.getCatalogTool()!=None)
     self.failUnless(self.getWorkflowTool()!=None)