More av fixing tweaks.
Avoid hanging when moving at EOF.