Merge "Fix some JobQueue IDEA errors"