Block fixes

Do not merge.
We will test some more blocks.