Event timing fixes