Continued fixes around related messages