Demo data and Message generation fix