Getting block auto-generation work again