Fixed some collateral damage from the merge.