Fix up some missing stuff after grafting