--- a/datacommsserver/esockserver/core_states/ss_corepractivities.cpp	Thu Aug 19 11:05:47 2010 +0300
+++ b/datacommsserver/esockserver/core_states/ss_corepractivities.cpp	Tue Aug 31 16:25:36 2010 +0300
@@ -1704,9 +1704,9 @@
     {
     __ASSERT_DEBUG(iPendingBinder, User::Panic(KSpecAssert_ESockCrStaCPRAC, 22));
 
-    PostRequestTo(
-        SoleOriginator().Peer(),
-        TCFServiceProvider::TCommsBinderResponse(iPendingBinder->RecipientId()).CRef());
+	PostRequestTo(
+		address_cast<Messages::TNodeId>(FirstOriginator().RecipientId()),
+		TCFServiceProvider::TCommsBinderResponse(iPendingBinder->RecipientId()).CRef());
 
 	iPendingBinder->SetFlags(TCFClientType::EActivating);
     }
@@ -2118,7 +2118,7 @@
 //
 //-=========================================================
 
-EXPORT_C MeshMachine::CNodeActivityBase* CGoneDownActivity::New(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode)
+MeshMachine::CNodeActivityBase* CGoneDownActivity::New(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode)
     	{
    		TAny* space = BorrowPreallocatedSpace(aNode, sizeof(CGoneDownActivity));
 		CGoneDownActivity* self = new (space) CGoneDownActivity(aActivitySig, aNode);
@@ -2180,7 +2180,7 @@
 	return NetStateMachine::ACore::IsIdle();
 	}
 
-EXPORT_DEFINE_SMELEMENT(CGoneDownActivity::TSendErrorRecoveryReq, NetStateMachine::MStateTransition, CGoneDownActivity::TContext)
+DEFINE_SMELEMENT(CGoneDownActivity::TSendErrorRecoveryReq, NetStateMachine::MStateTransition, CGoneDownActivity::TContext)
 void CGoneDownActivity::TSendErrorRecoveryReq::DoL()
     {
 	__ASSERT_DEBUG(iContext.iNodeActivity, User::Panic(KCorePrPanic, KPanicNoActivity));
@@ -2203,7 +2203,7 @@
     activity.ClearPostedTo();
     }
 
-EXPORT_DEFINE_SMELEMENT(CGoneDownActivity::TIgnoreOrPropagate, NetStateMachine::MStateFork, CGoneDownActivity::TContext)
+DEFINE_SMELEMENT(CGoneDownActivity::TIgnoreOrPropagate, NetStateMachine::MStateFork, CGoneDownActivity::TContext)
 TInt CGoneDownActivity::TIgnoreOrPropagate::TransitionTag()
     {
     __ASSERT_DEBUG(iContext.iMessage.IsMessage<TEErrorRecovery::TErrorRecoveryResponse>(), User::Panic(KSpecAssert_ESockCrStaCPRAC, 38));