Improvements to FileEntry seeking behaviour