Fix messages.. maybe