EagerCursor fixes