Fix various insane block bugs