Minor fixes to callgraph and utilities