Many fixes + Ignore cancelled events + Prevent fly