Fixes lost in merge.