diff --git a/edexOsgi/build.edex/edex/customTargets.xml b/edexOsgi/build.edex/edex/customTargets.xml
index d848fb0603..db764310a0 100644
--- a/edexOsgi/build.edex/edex/customTargets.xml
+++ b/edexOsgi/build.edex/edex/customTargets.xml
@@ -278,6 +278,12 @@
             	input="${edex.component}"
             	regexp="com-raytheon-uf-(.+)-feature"
             	select="\1" />
+
+            <propertyregex property="edex.component"
+                override="true"
+                input="${edex.component}"
+                regexp="^(?:edu|gov)-.*(edex-.+)-feature"
+                select="\1" />
         	
         	<!-- Create the distribution directory. -->
         	<mkdir dir="${builder}/dist" />
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/countyTypes.txt b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/countyTypes.txt
index db029789d7..2b9c59ef48 100755
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/countyTypes.txt
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/countyTypes.txt
@@ -14,6 +14,10 @@ PR \ MUNICIPALITY
 PUERTO RICO \ MUNICIPALITY
 PR+ \ MUNICIPALITIES
 PUERTO RICO+ \ MUNICIPALITIES
+GU \
+GUAM \
+GU+ \
+GUAM+ \
 DEFAULT+ \ COUNTIES
 DEFAULT \ COUNTY
 CITY \
\ No newline at end of file
diff --git a/rpms/awips2.core/Installer.pgadmin/component.spec b/rpms/awips2.core/Installer.pgadmin/component.spec
index 1a3c10495e..b6d0355144 100644
--- a/rpms/awips2.core/Installer.pgadmin/component.spec
+++ b/rpms/awips2.core/Installer.pgadmin/component.spec
@@ -21,9 +21,9 @@ Packager: Bryan Kowal
 
 AutoReq: no
 BuildRequires: awips2-postgresql = 9.2.3-1.el6
-BuildRequires: postgresql = 8.4.13-1.el6_3
-BuildRequires: postgresql-devel = 8.4.13-1.el6_3
-BuildRequires: postgresql-libs = 8.4.13-1.el6_3
+BuildRequires: postgresql >= 8.4.13-1.el6_3
+BuildRequires: postgresql-devel >= 8.4.13-1.el6_3
+BuildRequires: postgresql-libs >= 8.4.13-1.el6_3
 BuildRequires: wxGTK >= 2.8.12-1
 BuildRequires: wxGTK-devel >= 2.8.12-1