Some updates to debug messages