Fix blocks and make