Correct several mistakes causing troubles when removing a block