I am working on the rewrite of the whole chapter with the continuity problem. At first I wanted to bang my head on the keyboard, but I’m finding this solution fixes little minor nits that nagged me (but since never mentioned by any readers, probably didn’t bother them). I’m also getting the chance to work in more nuggets of backstory and foreshadowing.
So I guess this is win/win. If I can get this thing finished!