Some train fixes