Fix job data and status handling