Tweaks to get document read context somewhat sane