Message: fixes