My branch was behind the master. I have updated it. This fixes both issues. We are still using Delayed::job.