diff --git a/indra/lib/python/indra/util/fastest_elementtree.py b/indra/lib/python/indra/util/fastest_elementtree.py
index 66615804633f2bbac9fe464b3eee831f21ffd0d9..228be49ed3926259a7f57434a500e6a75fe7dafd 100644
--- a/indra/lib/python/indra/util/fastest_elementtree.py
+++ b/indra/lib/python/indra/util/fastest_elementtree.py
@@ -28,9 +28,7 @@
 
 # Using celementree might cause some unforeseen problems so here's a
 # convenient off switch.
-
-# *NOTE: turned off cause of problems.  :-(  *TODO: debug
-use_celementree = False
+use_celementree = True
 
 try:
     if not use_celementree:
diff --git a/indra/lib/python/indra/util/named_query.py b/indra/lib/python/indra/util/named_query.py
index 483a9606c8eb236635cf22868082a023bd10ad08..1457ff2a30855c609b5c06701b7a850781a5ebd4 100644
--- a/indra/lib/python/indra/util/named_query.py
+++ b/indra/lib/python/indra/util/named_query.py
@@ -63,7 +63,7 @@ def _init_g_named_manager(sql_dir = None):
 
     # extra fallback directory in case config doesn't return what we want
     if sql_dir is None:
-        sql_dir = os.path.dirname(__file__) + "../../../../web/dataservice/sql"
+        sql_dir = os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "web", "dataservice", "sql")
 
     global _g_named_manager
     _g_named_manager = NamedQueryManager(
@@ -106,8 +106,8 @@ def __init__(self, name, filename):
         a path to a file containing an llsd named query document."""
         self._stat_interval_seconds = 5  # 5 seconds
         self._name = name
-        if (filename is not None) \
-                and (NQ_FILE_SUFFIX != filename[-NQ_FILE_SUFFIX_LEN:]):
+        if (filename is not None
+            and NQ_FILE_SUFFIX != filename[-NQ_FILE_SUFFIX_LEN:]):
             filename = filename + NQ_FILE_SUFFIX
         self._location = filename
         self._alternative = dict()
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 489798910d08bcf93992539f18adac6a7faae3d7..3607318d7f43d57463ee0b74170a289134d80279 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -1761,7 +1761,11 @@ void LLParcel::startSale(const LLUUID& buyer_id, BOOL is_buyer_group)
 	setCleanOtherTime(0);
 }
 
-void LLParcel::expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id)
+void LLParcel::expireSale(
+	U32& type,
+	U8& flags,
+	LLUUID& from_id,
+	LLUUID& to_id)
 {
     mSaleTimerExpires.setTimerExpirySec(0.0);
     mSaleTimerExpires.stop();
@@ -1777,8 +1781,10 @@ void LLParcel::expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id)
     to_id.setNull();
 }
 
-void LLParcel::completeSale(U32& type, U8& flags,
-                            LLUUID& to_id)
+void LLParcel::completeSale(
+	U32& type,
+	U8& flags,
+	LLUUID& to_id)
 {
 	mSaleTimerExpires.setTimerExpirySec(0.0);
 	mSaleTimerExpires.stop();