Updates to troubleshoot some server job issues