Minor bug fixes with the messaging system