Fix up issues introduced by merge