Fixed message issues.