Minor bugs introduced by the merge.