diff --git a/edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java b/edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
index 660e331284..3099418a07 100644
--- a/edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
+++ b/edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
@@ -67,7 +67,8 @@ public class RemoteRequestRouteWrapper {
 
     private RemoteRequestServer server;
 
-    private int byteLimitInMB;
+    // default to 100MB
+    private int byteLimitInMB = 100;
 
     public byte[] executeThrift(InputStream data) {
         /*
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/.classpath b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/.classpath
index fd798babda..ad32c83a78 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/.classpath
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/.classpath
@@ -3,7 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="res"/>
-	<classpathentry kind="src" path="resources"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
index 580a790b58..247c7aed13 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
@@ -10,6 +10,7 @@
 
 	<bean id="routeWrapper" class="com.raytheon.uf.edex.registry.ebxml.RegistryRemoteRequestWrapper">
 		<property name="server" ref="serializeServer"/>
+        <property name="byteLimitInMB" value="${thriftService.byteLimitInMB}" />
 	</bean>    
 
     <bean id="binaryHttpBinding" class="com.raytheon.uf.edex.esb.camel.http.BinaryHttpBinding"/>