Updates to messaging and other fixes