Fixed messaging bugs.