Small tweaks to ghost train.