blocks: fixing bugs