Fix block

Many fix on block management