Minor changes
Fixed issue when calling jobs
Minor changes