Debug, dump improvements