Fix some events missing