Filter out old events, fix a couple of warnings