Couple small fixes in events API