Debug class improvements.