diff --git a/mbuni/doc/userguide.shtml b/mbuni/doc/userguide.shtml
index 1e7dec2..e186019 100644
--- a/mbuni/doc/userguide.shtml
+++ b/mbuni/doc/userguide.shtml
@@ -4103,12 +4103,13 @@ This interface should be invoked from your MTA as follows:<br><br>
 <tt>
 
 mmsfromemail -f <i>from_address</i> -t <i>recipient_address</i> 
--s <i>sender_mmsc_hostname</i> <i>[-n]</i><i>conf_file</i>
+-s <i>sender_mmsc_hostname</i>  <i>[-x]</i> <i>[-n]</i> <i>conf_file</i>
 </tt>
 <br/>
 <br>
 The <i>-n</i> flag may be used to prevent stripping of the host/domain
-part from the sender address. 
+part from the sender address. The <i>-x</i> flag causes the sender
+address to be stripped of the <tt>TYPE=PLMN</tt> part.
 <br>
 Note that no IP-based security is provided at this
 interface. It is expected that security measures (e.g. firewalls, etc) 
diff --git a/mbuni/extras/pgsql-queue/mms_pgsql_queue.c b/mbuni/extras/pgsql-queue/mms_pgsql_queue.c
index 9873309..42d0d2b 100644
--- a/mbuni/extras/pgsql-queue/mms_pgsql_queue.c
+++ b/mbuni/extras/pgsql-queue/mms_pgsql_queue.c
@@ -147,7 +147,7 @@ static int pgq_cleanup_module(void)
 
 #define get_conn() get_conn_real(__FUNCTION__, __FILE__, __LINE__)
 #define return_conn(conn) return_conn_real((conn), __FUNCTION__, __FILE__, __LINE__)
-#define DEFAULT_PG_WAIT 30 /* fail after 2 minutes. */
+#define DEFAULT_PG_WAIT 60 /* fail after 2 minutes. */
 static PGconn *get_conn_real(const char *function, const char *file, const int line)
 {
      PGconn *c;