Some temporary hacks to try to tease out seam problems