More tweaks for receiving and sending messages