few fixes on the job 19368