diff --git a/configure/RELEASE b/configure/RELEASE
index d9792a0..61a9528 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -25,9 +25,10 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 #SNCSEQ=$(EPICS_BASE)/../modules/soft/seq
 
 # EPICS_BASE usually appears last so other apps can override stuff:
-EPICS_BASE=/opt/epics/base
 
-PVDATA_HOME=/opt/epics/pvDataCPP
+PVDATA=/opt/epics/pvDataCPP
+
+EPICS_BASE=/opt/epics/base
 
 # Set RULES here if you want to take build rules from somewhere
 # other than EPICS_BASE:
diff --git a/pvAccessApp/Makefile b/pvAccessApp/Makefile
index d736c71..4125552 100644
--- a/pvAccessApp/Makefile
+++ b/pvAccessApp/Makefile
@@ -80,5 +80,6 @@ LIBSRCS += clientContextImpl.cpp
 
 LIBRARY = pvAccess
 pvAccess_LIBS += Com
+pvAccess_LIBS += pvData
 
 include $(TOP)/configure/RULES
diff --git a/pvAccessApp/factory/CreateRequestFactory.cpp b/pvAccessApp/factory/CreateRequestFactory.cpp
index 23fb95e..3c0c164 100644
--- a/pvAccessApp/factory/CreateRequestFactory.cpp
+++ b/pvAccessApp/factory/CreateRequestFactory.cpp
@@ -82,7 +82,8 @@ class CreateRequestImpl : public CreateRequest {
         			return false;
     			}
     			if(!createLeafFieldRequest(pvParent,request.substr(0, closeBracket+1),requester)) return false;
-    			if(request.rfind(',')>closeBracket) {
+                        size_t commaLoc = request.rfind(',');
+                        if(commaLoc!=std::string::npos && commaLoc>closeBracket) {
     				int nextComma = request.find(',', closeBracket);
     				if(!createFieldRequest(pvParent,request.substr(nextComma+1),false,requester)) return false;
     			}