Change some to use new debug unlabelled interface