diff --git a/lib/xos-config/setup.py b/lib/xos-config/setup.py
index 57f2939..5efef5c 100644
--- a/lib/xos-config/setup.py
+++ b/lib/xos-config/setup.py
@@ -32,7 +32,7 @@
     # parse a requirements.txt file, allowing for blank lines and comments
     requirements = []
     for line in open(filename):
-        if line and line.startswith("#"):
+        if line and not line.startswith("#"):
             requirements.append(line)
     return requirements
 
@@ -42,7 +42,8 @@
     version=version(),
     description="XOS Config Library",
     author="Matteo Scandolo",
-    author_email="teo@opennetworking.org",
+    author_email="cord-dev@opencord.org",
+    url="https://gerrit.opencord.org/gitweb?p=xos.git",
     classifiers=["License :: OSI Approved :: Apache Software License"],
     license="Apache v2",
     packages=["xosconfig"],
diff --git a/lib/xos-genx/setup.py b/lib/xos-genx/setup.py
index f1bc5a5..32bdff4 100644
--- a/lib/xos-genx/setup.py
+++ b/lib/xos-genx/setup.py
@@ -32,7 +32,7 @@
     # parse a requirements.txt file, allowing for blank lines and comments
     requirements = []
     for line in open(filename):
-        if line and line.startswith("#"):
+        if line and not line.startswith("#"):
             requirements.append(line)
     return requirements
 
@@ -42,7 +42,8 @@
     version=version(),
     description="XOS Generative Toolchain",
     author="Sapan Bhatia, Matteo Scandolo",
-    author_email="sapan@opennetworking.org, teo@opennetworking.org",
+    author_email="cord-dev@opencord.org",
+    url="https://gerrit.opencord.org/gitweb?p=xos.git",
     classifiers=["License :: OSI Approved :: Apache Software License"],
     license="Apache v2",
     packages=["xosgenx"],
diff --git a/lib/xos-genx/xosgenx/jinja2_extensions/base.py b/lib/xos-genx/xosgenx/jinja2_extensions/base.py
index f4929a9..7e10e7d 100644
--- a/lib/xos-genx/xosgenx/jinja2_extensions/base.py
+++ b/lib/xos-genx/xosgenx/jinja2_extensions/base.py
@@ -35,7 +35,7 @@
 
 
 def unquote(s):
-    if s.startswith('"') and s.endswith('"'):
+    if s and s.startswith('"') and s.endswith('"'):
         return s[1:-1]
     else:
         return s