Fix some merge oopses