Revise debug and log messages