more Event bugs fixes