Some fixes in the messages sent by unit