fix issues with creating EventMessages