Missed some changes for hedwig34 branch.