Changes to debug commands