MANTA-28 bugfixes from early local-assembly modifications