Large friend and event fixes