More messages fixed