Tags corrections for 1.0.6.1