Fixes on delete message