fix activities & messages