Improve debugger support