Updates to fix mixing pup and other jobs