Fixes for edit messages.