Small changes for printing some debug info