Fix more merge-related issues