Fix issues introduced by a botched merge