Fix program graph generation