Fix debug messages. Add messages in block