VE-174 Use correct functions for messages