Fix common messaging issues

Return to top