Fixing some messages on the receiver side