diff --git a/p2pApp/server.cpp b/p2pApp/server.cpp
index 7a7bc9a..3a263bb 100644
--- a/p2pApp/server.cpp
+++ b/p2pApp/server.cpp
@@ -133,8 +133,8 @@ void startServer()
             return;
         }
 
-        pva::ChannelProvider::shared_pointer client(pva::ChannelProviderRegistry::clients()->getProvider("pva")),
-                                             server(new GWServerChannelProvider(client));
+        pva::ChannelProvider::shared_pointer client(pva::ChannelProviderRegistry::clients()->getProvider("pva"));
+        GWServerChannelProvider::shared_pointer server(new GWServerChannelProvider(client));
 
         gblctx = pva::ServerContext::create(pva::ServerContext::Config()
                                             .provider(server)
diff --git a/pdbApp/pdbgroup.cpp b/pdbApp/pdbgroup.cpp
index 3231550..11e2cb9 100644
--- a/pdbApp/pdbgroup.cpp
+++ b/pdbApp/pdbgroup.cpp
@@ -97,7 +97,7 @@ pva::Channel::shared_pointer
 PDBGroupPV::connect(const std::tr1::shared_ptr<PDBProvider>& prov,
                     const pva::ChannelRequester::shared_pointer& req)
 {
-    pva::Channel::shared_pointer ret(new PDBGroupChannel(shared_from_this(), prov, req));
+    PDBGroupChannel::shared_pointer ret(new PDBGroupChannel(shared_from_this(), prov, req));
     return ret;
 }
 
@@ -125,7 +125,7 @@ PDBGroupChannel::createChannelPut(
         pva::ChannelPutRequester::shared_pointer const & requester,
         pvd::PVStructure::shared_pointer const & pvRequest)
 {
-    pva::ChannelPut::shared_pointer ret(new PDBGroupPut(shared_from_this(), requester, pvRequest));
+    PDBGroupPut::shared_pointer ret(new PDBGroupPut(shared_from_this(), requester, pvRequest));
     requester->channelPutConnect(pvd::Status(), ret, fielddesc);
     return ret;
 }
diff --git a/pdbApp/pdbsingle.cpp b/pdbApp/pdbsingle.cpp
index 37e7f74..dbc6a3f 100644
--- a/pdbApp/pdbsingle.cpp
+++ b/pdbApp/pdbsingle.cpp
@@ -98,7 +98,7 @@ pva::Channel::shared_pointer
 PDBSinglePV::connect(const std::tr1::shared_ptr<PDBProvider>& prov,
                      const pva::ChannelRequester::shared_pointer& req)
 {
-    pva::Channel::shared_pointer ret(new PDBSingleChannel(shared_from_this(), req));
+    PDBSingleChannel::shared_pointer ret(new PDBSingleChannel(shared_from_this(), req));
     return ret;
 }
 
@@ -126,7 +126,7 @@ PDBSingleChannel::createChannelPut(
         pva::ChannelPutRequester::shared_pointer const & requester,
         pvd::PVStructure::shared_pointer const & pvRequest)
 {
-    pva::ChannelPut::shared_pointer ret(new PDBSinglePut(shared_from_this(), requester, pvRequest));
+    PDBSinglePut::shared_pointer ret(new PDBSinglePut(shared_from_this(), requester, pvRequest));
     requester->channelPutConnect(pvd::Status(), ret, fielddesc);
     return ret;
 }