Unlock items after rollback
Some changes in methods visibility
Cosmetic