Add job count when there are suspended jobs
Misc changes