Fixed a couple of issues with sendMessage.