Job control fixes