diff --git a/cave/build/static/common/cave/etc/ncep/DefaultRBDs/defaultRBD.xml b/cave/build/static/common/cave/etc/ncep/DefaultRBDs/defaultRBD.xml
index 7c3a638a94..0593f7e3df 100644
--- a/cave/build/static/common/cave/etc/ncep/DefaultRBDs/defaultRBD.xml
+++ b/cave/build/static/common/cave/etc/ncep/DefaultRBDs/defaultRBD.xml
@@ -91,7 +91,7 @@
                                 <mapName>Canada</mapName>
                                 <table>mapdata.canada</table>
                                 <geomField>the_geom</geomField>
-                                <labelField>name_en</labelField>
+                                <labelField>name</labelField>
                                 <color>RGB {255, 228, 220}</color>
                                 <lineWidth>1</lineWidth>
                                 <lineStyle>SOLID</lineStyle>
diff --git a/ncep/gov.noaa.nws.ncep.common/component-deploy.xml b/ncep/gov.noaa.nws.ncep.common/component-deploy.xml
index c0df35ef65..e0fe48e841 100644
--- a/ncep/gov.noaa.nws.ncep.common/component-deploy.xml
+++ b/ncep/gov.noaa.nws.ncep.common/component-deploy.xml
@@ -1,6 +1,10 @@
 <project basedir="." default="deploy" name="gov.noaa.nws.ncep.common">
-	<available file="../build.edex" property="build.dir.location" value="../build.edex" />
-	<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
+    <available file="../../edexOsgi/build.edex" 
+    	property="build.dir.location" 
+    	value="../../edexOsgi/build.edex"/>
+    <available file="../../../../../build.edex" 
+    	property="build.dir.location" 
+    	value="../../../../../build.edex"/>
 
 	<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
 
diff --git a/ncep/gov.noaa.nws.ncep.viz.overlays/localization/ncep/resourceTemplates/OverlayGroup.xml b/ncep/gov.noaa.nws.ncep.viz.overlays/localization/ncep/resourceTemplates/OverlayGroup.xml
index 392d05c966..99661b11b2 100644
--- a/ncep/gov.noaa.nws.ncep.viz.overlays/localization/ncep/resourceTemplates/OverlayGroup.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.overlays/localization/ncep/resourceTemplates/OverlayGroup.xml
@@ -46,7 +46,7 @@
               </properties>
               <resourceData xsi:type="NC-dbOverlayResourceData">
                 <table>mapdata.canada</table>
-                <labelField>name_en</labelField>
+                <labelField>name</labelField>
                 <mapName>Canada</mapName>
               </resourceData>
             </resource>