More sh6 debugging output changes