[TrainModel & Environment] Small updates