More messaging bug fixes.