2 files changed, 2 insertions, 2 deletions
diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py
index 33d50d6b19..66b6f3fcff 100644
--- a/grc/core/generator/Generator.py
+++ b/grc/core/generator/Generator.py
@@ -243,7 +243,7 @@ class TopBlockGenerator(object):
         }
         # Build the template
         t = Template(open(FLOW_GRAPH_TEMPLATE, 'r').read(), namespace)
-        output.append((self.file_path, str(t)))
+        output.append((self.file_path, "\n".join(line.rstrip() for line in str(t).split("\n"))))
         return output
 
 
diff --git a/grc/core/utils/epy_block_io.py b/grc/core/utils/epy_block_io.py
index 53a1bb3c72..a094ab7ad5 100644
--- a/grc/core/utils/epy_block_io.py
+++ b/grc/core/utils/epy_block_io.py
@@ -25,7 +25,7 @@ def _ports(sigs, msgs):
     for msg_key in msgs:
         if msg_key == 'system':
             continue
-        ports.append((msg_key, 'message', None))
+        ports.append((msg_key, 'message', 1))
     return ports