Fix block instance issues