diff --git a/pvAccessApp/remote/blockingTCPTransport.cpp b/pvAccessApp/remote/blockingTCPTransport.cpp
index 7109095..a99c655 100644
--- a/pvAccessApp/remote/blockingTCPTransport.cpp
+++ b/pvAccessApp/remote/blockingTCPTransport.cpp
@@ -1039,8 +1039,8 @@ namespace pvAccess {
                 // poor throughput performances when transferring large amount of
                 // data. See Microsoft KB article KB823764.
                 // We do it also for other systems just to be safe.
-                int maxBytesToSend = min(_socketSendBufferSize,
-                        _remoteTransportSocketReceiveBufferSize)/2;
+                int maxBytesToSend = std::min(_socketSendBufferSize,
+                        static_cast<int>(_remoteTransportSocketReceiveBufferSize))/2;
 
                 int limit = buffer->getLimit();
                 int bytesToSend = limit-buffer->getPosition();
diff --git a/testApp/remote/testChannelAccess.cpp b/testApp/remote/testChannelAccess.cpp
index a2be71b..4f40f04 100755
--- a/testApp/remote/testChannelAccess.cpp
+++ b/testApp/remote/testChannelAccess.cpp
@@ -9,7 +9,6 @@
 
 #include <pv/serverContext.h>
 #include <pv/clientFactory.h>
-#include <pv/clientContextImpl.h>
 
 #include "channelAccessIFTest.h"
 
@@ -58,7 +57,7 @@ class ChannelAccessIFRemoteTest: public ChannelAccessIFTest  {
 
     virtual ChannelProvider::shared_pointer getChannelProvider() {
       return getChannelAccess()->getProvider(
-          ClientContextImpl::PROVIDER_NAME);
+          "pva");
     }