Add missing activity types. Adjust error message text.