Fix more activity problems (#4236)