Job Manage + RIR Fix