Various fixes on train