--- channels/chan_ooh323.c	2009-06-15 00:14:48.000000000 +0400
+++ ../../asterisk-addons-1.6.1.0/channels/chan_ooh323.c	2009-06-11 08:59:31.000000000 +0400
@@ -993,9 +993,10 @@
 						 "formats is %d (read/write = %d/%d)\n",
 						f->subclass, ast->nativeformats, ast->readformat,
 										ast->writeformat);
-				} else {
-					ast->nativeformats = f->subclass;
 					ast_set_write_format(ast, f->subclass);
+				} else {
+					/* ast_set_write_format(ast, f->subclass);
+					ast->nativeformats = f->subclass; */
 				}
 			ast_mutex_unlock(&p->lock);
 			return 0;
--- channels/ooh323c/src/ooCalls.c	2009-06-15 00:14:44.000000000 +0400
+++ ../../asterisk-addons-1.6.1.0/channels/ooh323c/src/ooCalls.c	2009-06-12 03:52:54.000000000 +0400
@@ -683,7 +683,7 @@
    if(!gH323ep.callList)
    {
       OOTRACEERR1("ERROR: Empty calllist - ooFindCallByToken failed\n");
-      ast_mutex_lock(&callListLock);
+      ast_mutex_unlock(&callListLock);
       return NULL;
    }
    call = gH323ep.callList;
--- channels/ooh323c/src/ooq931.c	2009-06-15 00:14:44.000000000 +0400
+++ ../../asterisk-addons-1.6.1.0/channels/ooh323c/src/ooq931.c	2009-06-12 03:52:54.000000000 +0400
@@ -504,7 +504,7 @@
    ASN1BOOL aligned = TRUE;
    Q931InformationElement* ie=NULL;
    /* OOCTXT *pctxt = &gH323ep.msgctxt; */
-   /*   memset(msgbuf, 0, sizeof(msgbuf));*/
+   memset(msgbuf, 0, sizeof(msgbuf));
    if(!q931msg)
    {
       OOTRACEERR1("ERROR: Invalid Q931 message in add user-user IE\n");
--- channels/ooh323c/src/ooh245.c	2009-06-15 00:14:48.000000000 +0400
+++ ../../asterisk-addons-1.6.1.0/channels/ooh323c/src/ooh245.c	2009-06-12 03:52:54.000000000 +0400
@@ -2885,7 +2885,7 @@
    OOTRACEINFO3("Looking for matching capabilities. (%s, %s)\n", 
                  call->callType, call->callToken);
 /* May */
-   if(call->masterSlaveState == OO_MasterSlave_Master && 0)
+   if(call->masterSlaveState == OO_MasterSlave_Master)
    {
       for(k=0; k<call->capPrefs.index; k++)
       {
@@ -2924,7 +2924,7 @@
       }
 
    }
-   else if(call->masterSlaveState == OO_MasterSlave_Slave || 1)
+   else if(call->masterSlaveState == OO_MasterSlave_Slave)
    {
       epCap = call->jointCaps;