fixes related to new SGE + castor + pollux differences