Fix messages
Fix command args