Attempted hotfix for https://github.com/EnergizedProtection/block/issues/529

[DandelionSprout]

• Fix https://github.com/EnergizedProtection/block/issues/529.
• Also corrects one of the many things that were pointed out in https://github.com/EnergizedProtection/block/issues/531.