Some more stalled job tweaks