Fixed minor issues in job building and validation