Fix the bugs in the blocks