Fix events endpoint