Small corrects + message data