Many multiblock fixes