Tweak debug handler