TRAINING-36: A few adjustments