Fix debugger issues