Fix all the block helpers