Fix bugs in last round of Debug changes ( issue #331 )