fix some merge-introduced problems