Small fixes on events confirmations