Fixed some message sending problems