Block fixes

Do not merge.
We will test some more blocks.
This is a bad comment, I have no idea what it means.