Applying more broadly the debug flag - reduce message pollution