Fixed Jobs bugs