Fix custom blocks