CSN graph creation fixes