Fixing debug messages