Minor fixes to get initial retroactive weaving POC working again!