Fix stale entity fetch and GeoPtWrapper implementation.