Minor changes in debugging