Some bug fix, job state graph update