diff --git a/dbcon/mysql/columnstore.cnf b/dbcon/mysql/columnstore.cnf
index 19840e129..682745401 100644
--- a/dbcon/mysql/columnstore.cnf
+++ b/dbcon/mysql/columnstore.cnf
@@ -1,6 +1,7 @@
 [mysqld]
 plugin-load-add=ha_columnstore.so
 plugin-maturity=beta
+lower_case_table_names=1
 
 # Enable compression by default on create, set to NONE to turn off
 #columnstore_compression_type=SNAPPY
diff --git a/oam/etc/Columnstore.xml b/oam/etc/Columnstore.xml
index b9683325d..e347768fe 100644
--- a/oam/etc/Columnstore.xml
+++ b/oam/etc/Columnstore.xml
@@ -490,8 +490,7 @@
 		<MaxElems>128K</MaxElems>  <!-- 128 buckets * 128K * 16 = 256 MB -->
 		<FifoSizeLargeSide>64</FifoSizeLargeSide>
 		<PmMaxMemorySmallSide>1G</PmMaxMemorySmallSide>
-		<TotalUmMemory>100%</TotalUmMemory>
-		<TotalPmUmMemory>100%</TotalPmUmMemory>
+		<TotalUmMemory>25%</TotalUmMemory>
 		<CPUniqueLimit>100</CPUniqueLimit>
 		<AllowDiskBasedJoin>N</AllowDiskBasedJoin>
 		<!-- Be careful modifying TempFilePath!  On start, ExeMgr deletes