Fix debugger issues
Fix more merge conflicts