Trains fixes

Trains fixes