Fix messages and debug
Fix messages and debug