diff --git a/pvAccessApp/Makefile b/pvAccessApp/Makefile
index 1884a1b..b770b6c 100644
--- a/pvAccessApp/Makefile
+++ b/pvAccessApp/Makefile
@@ -1,7 +1,7 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
-PVACCESS = $(TOP)/pvAccessApp/
+PVACCESS = $(TOP)/pvAccessApp
 USR_CXXFLAGS_RTEMS = -D__rtems__
 
 SRC_DIRS += $(PVACCESS)/pva
diff --git a/testApp/client/Makefile b/testApp/client/Makefile
index 7201c44..cefa61e 100644
--- a/testApp/client/Makefile
+++ b/testApp/client/Makefile
@@ -4,19 +4,19 @@ include $(TOP)/configure/CONFIG
 
 #PROD_HOST += testChannelAccessFactory
 testChannelAccessFactory_SRCS = testChannelAccessFactory.cpp
-testChannelAccessFactory_LIBS = pvData pvAccess Com
+testChannelAccessFactory_LIBS = pvAccess pvData Com
 
 PROD_HOST += testCreateRequest
 testCreateRequest_SRCS = testCreateRequest.cpp
-testCreateRequest_LIBS = pvData pvAccess pvMB Com
+testCreateRequest_LIBS = pvAccess pvData pvMB Com
 
 #PROD_HOST += testMockClient
 testMockClient_SRCS = testMockClient.cpp MockClientImpl.cpp
-testMockClient_LIBS = pvData pvAccess Com
+testMockClient_LIBS = pvAccess pvData Com
 
 PROD_HOST += testStartStop
 testStartStop_SRCS = testStartStop.cpp
-testStartStop_LIBS = pvData pvAccess pvMB Com
+testStartStop_LIBS = pvAccess pvData pvMB Com
 
 include $(TOP)/configure/RULES
 #----------------------------------------
diff --git a/testApp/remote/Makefile b/testApp/remote/Makefile
index 9308543..fa415d2 100644
--- a/testApp/remote/Makefile
+++ b/testApp/remote/Makefile
@@ -4,76 +4,76 @@ include $(TOP)/configure/CONFIG
 
 #PROD_HOST += testBlockingUDPSrv
 testBlockingUDPSrv_SRCS += testBlockingUDPSrv.cpp
-testBlockingUDPSrv_LIBS += pvData pvAccess pvMB Com
+testBlockingUDPSrv_LIBS += pvAccess pvData pvMB Com
 
 #PROD_HOST += testBlockingUDPClnt
 testBlockingUDPClnt_SRCS += testBlockingUDPClnt.cpp
-testBlockingUDPClnt_LIBS += pvData pvAccess pvMB Com
+testBlockingUDPClnt_LIBS += pvAccess pvData pvMB Com
 
 PROD_HOST += testRemoteClientImpl
 testRemoteClientImpl_SRCS += testRemoteClientImpl.cpp
-testRemoteClientImpl_LIBS += pvData pvAccess pvMB Com
+testRemoteClientImpl_LIBS += pvAccess pvData pvMB Com
 
 PROD_HOST += testChannelConnect
 testChannelConnect_SRCS += testChannelConnect.cpp
-testChannelConnect_LIBS += pvData pvAccess pvMB Com
+testChannelConnect_LIBS += pvAccess pvData pvMB Com
 
 #PROD_HOST += testBeaconEmitter
 testBeaconEmitter_SRCS += testBeaconEmitter.cpp
-testBeaconEmitter_LIBS += pvData pvAccess Com
+testBeaconEmitter_LIBS += pvAccess pvData Com
 
 #PROD_HOST += testBeaconHandler
 testBeaconHandler_SRCS += testBeaconHandler.cpp
-testBeaconHandler_LIBS += pvData pvAccess Com
+testBeaconHandler_LIBS += pvAccess pvData Com
 
 #PROD_HOST += testChannelSearchManager
 #testChannelSearchManager_SRCS += testChannelSearchManager.cpp
-#testChannelSearchManager_LIBS += pvData pvAccess Com
+#testChannelSearchManager_LIBS += pvAccess pvData Com
 
 #PROD_HOST += testBlockingTCPSrv
 testBlockingTCPSrv_SRCS += testBlockingTCPSrv.cpp
-testBlockingTCPSrv_LIBS += pvData pvAccess pvMB Com
+testBlockingTCPSrv_LIBS += pvAccess pvData pvMB Com
 
 #PROD_HOST += testBlockingTCPClnt
 testBlockingTCPClnt_SRCS += testBlockingTCPClnt.cpp
-testBlockingTCPClnt_LIBS += pvData pvAccess pvMB Com
+testBlockingTCPClnt_LIBS += pvAccess pvData pvMB Com
 
 PROD_HOST += testServerContext
 testServerContext_SRCS += testServerContext.cpp
-testServerContext_LIBS += pvData pvAccess pvMB Com
+testServerContext_LIBS += pvAccess pvData pvMB Com
 
 PROD_HOST += testServer
 testServer_SRCS += testServer.cpp
-testServer_LIBS += pvData pvAccess pvMB Com
+testServer_LIBS += pvAccess pvData pvMB Com
 
 TESTPROD_HOST += testChannelAccess
 testChannelAccess_SRCS = testChannelAccess channelAccessIFTest
-testChannelAccess_LIBS += pvData pvAccess pvMB Com
+testChannelAccess_LIBS += pvAccess pvData pvMB Com
 TESTS += testChannelAccess
 
 PROD_HOST += pvget
 pvget_SRCS += pvget.cpp
-pvget_LIBS += pvData pvAccess pvMB Com
+pvget_LIBS += pvAccess pvData pvMB Com
 
 PROD_HOST += pvput
 pvput_SRCS += pvput.cpp
-pvput_LIBS += pvData pvAccess pvMB Com
+pvput_LIBS += pvAccess pvData pvMB Com
 
 PROD_HOST += pvinfo
 pvinfo_SRCS += pvinfo.cpp
-pvinfo_LIBS += pvData pvAccess pvMB Com
+pvinfo_LIBS += pvAccess pvData pvMB Com
 
 PROD_HOST += testGetPerformance
 testGetPerformance_SRCS += testGetPerformance.cpp
-testGetPerformance_LIBS += pvData pvAccess pvMB Com
+testGetPerformance_LIBS += pvAccess pvData pvMB Com
 
 PROD_HOST += eget
 eget_SRCS += eget.cpp
-eget_LIBS += pvData pvAccess pvMB Com
+eget_LIBS += pvAccess pvData pvMB ca Com
 
 PROD_HOST += rpcServiceExample
 rpcServiceExample_SRCS += rpcServiceExample.cpp
-rpcServiceExample_LIBS += pvData pvAccess pvMB Com
+rpcServiceExample_LIBS += pvAccess pvData pvMB Com
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)