Slurm fixes

Merged Chris Hines requested to merge slurm_fixes into master

Merge request reports