diff --git a/src/core/coap/coap.cpp b/src/core/coap/coap.cpp
index 726c2f483..bb76b5326 100644
--- a/src/core/coap/coap.cpp
+++ b/src/core/coap/coap.cpp
@@ -622,7 +622,6 @@ void Coap::ProcessReceivedRequest(Header &aHeader, Message &aMessage, const Ip6:
         SuccessOrExit(mInterceptor(aMessage, aMessageInfo));
     }
 
-    SuccessOrExit(aHeader.FromMessage(aMessage, 0));
     aMessage.MoveOffset(aHeader.GetLength());
 
     switch (mResponsesQueue.GetMatchedResponseCopy(aHeader, aMessageInfo, &response))
diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp
index fdf8188a7..854390a3e 100644
--- a/src/core/meshcop/dataset_manager.cpp
+++ b/src/core/meshcop/dataset_manager.cpp
@@ -571,9 +571,6 @@ ThreadError DatasetManager::Set(Coap::Header &aHeader, Message &aMessage, const
 
         memset(&destination, 0, sizeof(destination));
         destination = mNetif.GetMle().GetMeshLocal16();
-        destination.mFields.m16[4] = HostSwap16(0x0000);
-        destination.mFields.m16[5] = HostSwap16(0x00ff);
-        destination.mFields.m16[6] = HostSwap16(0xfe00);
         destination.mFields.m16[7] = HostSwap16(borderAgentLocator->GetBorderAgentLocator());
 
         mNetif.GetLeader().SendDatasetChanged(destination);
diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp
index c9c4a340d..f9f52532f 100644
--- a/src/core/meshcop/joiner.cpp
+++ b/src/core/meshcop/joiner.cpp
@@ -335,7 +335,7 @@ void Joiner::SendJoinerFinalize(void)
                       message->GetLength() - header.GetLength());
 #endif
 
-    mNetif.GetCoapSecure().SendMessage(*message, Joiner::HandleJoinerFinalizeResponse, this);
+    SuccessOrExit(error = mNetif.GetCoapSecure().SendMessage(*message, Joiner::HandleJoinerFinalizeResponse, this));
 
     otLogInfoMeshCoP(GetInstance(), "Sent joiner finalize");