Fix ugly events lock issue

As diagnosed on @proti's setup, when developing Salvador
Implement set.last