Further changes to debug commands