TrainCtrl fixes.