Fixed message issues