Fix events in server handler