Tweaks to how we treat invalid jobs