A few more debug shell fixes.