Minor modifcations to debug output