Fix demo messaging