TRAINING-36: Fixes to paths