Multiblock bugfixes