Remove deprecated block
Typo
Fix tags mecanism
Update fix var name