fixing message constructors