Final bits of Toms changes