Last, Next event fixes