diff --git a/configure/RELEASE b/configure/RELEASE
index 05c28d6..39ba077 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -26,8 +26,8 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 
 # EPICS_BASE usually appears last so other apps can override stuff:
 
-PVDATA=/opt/epics/pvDataCPP
-EPICS_BASE=/opt/epics/base
+PVDATA=/home/mrk/hg/pvDataCPP
+EPICS_BASE=/home/install/epics/base
 
 #PVDATA=/home/mrk/hg/pvDataCPP
 #EPICS_BASE=/home/install/epics/base
diff --git a/pvAccessApp/server/responseHandlers.cpp b/pvAccessApp/server/responseHandlers.cpp
index 0e71812..f38a7c8 100644
--- a/pvAccessApp/server/responseHandlers.cpp
+++ b/pvAccessApp/server/responseHandlers.cpp
@@ -1162,7 +1162,7 @@ ServerMonitorRequesterImpl::ServerMonitorRequesterImpl(ServerContextImpl* contex
 	INIT_EXCEPTION_GUARD(13, _channelMonitor = channel->getChannel()->createMonitor(this, pvRequest));
 }
 
-void ServerMonitorRequesterImpl::monitorConnect(const Status& status, Monitor* monitor, Structure* structure)
+void ServerMonitorRequesterImpl::monitorConnect(const Status& status, Monitor* monitor, StructureConstPtr structure)
 {
 	{
 		Lock guard(_mutex);
diff --git a/pvAccessApp/server/responseHandlers.h b/pvAccessApp/server/responseHandlers.h
index 6e64ed5..9fb86f3 100644
--- a/pvAccessApp/server/responseHandlers.h
+++ b/pvAccessApp/server/responseHandlers.h
@@ -498,7 +498,7 @@ namespace epics {
         {
         public:
         	ServerMonitorRequesterImpl(ServerContextImpl* context, ServerChannelImpl* channel, const pvAccessID ioid, Transport* transport,epics::pvData::PVStructure* pvRequest);
-        	void monitorConnect(const epics::pvData::Status& status, epics::pvData::Monitor* monitor, epics::pvData::Structure* structure);
+        	void monitorConnect(const epics::pvData::Status& status, epics::pvData::Monitor* monitor, epics::pvData::StructureConstPtr structure);
         	void unlisten(epics::pvData::Monitor* monitor);
         	void monitorEvent(epics::pvData::Monitor* monitor);
         	void lock();
@@ -512,7 +512,7 @@ namespace epics {
         private:
         	 epics::pvData::Monitor* _monitor;
         	 epics::pvData::Monitor* _channelMonitor;
-        	 epics::pvData::Structure* _structure;
+        	 epics::pvData::StructureConstPtr _structure;
         	 epics::pvData::Status _status;
         };
 
diff --git a/testApp/client/MockClientImpl.cpp b/testApp/client/MockClientImpl.cpp
index 6b5de67..b1abf3f 100644
--- a/testApp/client/MockClientImpl.cpp
+++ b/testApp/client/MockClientImpl.cpp
@@ -842,7 +842,7 @@ class MonitorRequesterImpl : public MonitorRequester
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl; 
     }
     
-    virtual void monitorConnect(const Status& status, Monitor* monitor, Structure* structure)
+    virtual void monitorConnect(const Status& status, Monitor* monitor, StructureConstPtr structure)
     {
         std::cout << "monitorConnect(" << status.toString() << ")" << std::endl;
         if (structure)
diff --git a/testApp/remote/testRemoteClientImpl.cpp b/testApp/remote/testRemoteClientImpl.cpp
index 21bfb84..206822f 100644
--- a/testApp/remote/testRemoteClientImpl.cpp
+++ b/testApp/remote/testRemoteClientImpl.cpp
@@ -384,7 +384,7 @@ class MonitorRequesterImpl : public MonitorRequester
         std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
     }
 
-    virtual void monitorConnect(const epics::pvData::Status& status, Monitor* monitor, Structure* structure)
+    virtual void monitorConnect(const epics::pvData::Status& status, Monitor* monitor, StructureConstPtr structure)
     {
         std::cout << "monitorConnect(" << status.toString() << ")" << std::endl;
         if (status.isSuccess() && structure)