Work on debugging facilities