Fix block helpers