Cargo train fixes