Fixes for a couple of edge issues in the output graph

Fixes #10