diff --git a/org.adempiere.base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java
index d6c777eeb6..5366df5418 100644
--- a/org.adempiere.base/src/org/compiere/model/PO.java
+++ b/org.adempiere.base/src/org/compiere/model/PO.java
@@ -2003,7 +2003,11 @@ public abstract class PO
 		Savepoint savepoint = null;
 		if (m_trxName == null)
 		{
-			m_trxName = Trx.createTrxName(LOCAL_TRX_PREFIX + get_TableName());
+			StringBuilder l_trxname = new StringBuilder(LOCAL_TRX_PREFIX)
+				.append(get_TableName());
+			if (l_trxname.length() > 23)
+				l_trxname.setLength(23);
+			m_trxName = Trx.createTrxName(l_trxname.toString());
 			localTrx = Trx.get(m_trxName, true);
 		}
 		else
diff --git a/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml b/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml
index a6f8f969c6..d5e7dd3ed9 100644
--- a/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml
+++ b/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml
@@ -2,6 +2,10 @@
 
 	<!--
 		zk.xml Copyright (C) 2006 Potix Corporation. All Rights Reserved.
+		
+		Instructions:
+		Add next parameter to the VM arguments of the server launcher
+		-Dorg.zkoss.zk.config.path=file://${workspace_loc}/org.adempiere.ui.zk/WEB-INF/zk-selenium.xml
 	-->
 
 <zk>
diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml
index 112af0d53a..5daaf01371 100644
--- a/org.adempiere.ui.zk/WEB-INF/zk.xml
+++ b/org.adempiere.ui.zk/WEB-INF/zk.xml
@@ -46,7 +46,7 @@
 		</system-config>
 	-->
 
-	<!-- uncomment the following for selenium testing -->
+	<!-- uncomment the following for selenium testing / see zk-selenium.xml for an easier way -->
 	<!--  system-config>
 		<id-generator-class>org.adempiere.webui.AdempiereIdGenerator</id-generator-class>
 	</system-config -->
diff --git a/org.compiere.db.postgresql.provider/META-INF/pool/server.default.properties b/org.compiere.db.postgresql.provider/META-INF/pool/server.default.properties
index ded1e890e6..5171468c3d 100644
--- a/org.compiere.db.postgresql.provider/META-INF/pool/server.default.properties
+++ b/org.compiere.db.postgresql.provider/META-INF/pool/server.default.properties
@@ -6,7 +6,8 @@ MaxIdleTime=1200
 #UnreturnedConnectionTimeout=1800
 
 #size
-MaxPoolSize=150
+# Verify that MaxPoolSize is lesser than max_connections defined on postgresql.conf
+MaxPoolSize=90
 InitialPoolSize=10
 MinPoolSize=5