Beefed up debug methods