Fixed `fireEvent` in confirm/alert dialog and some small other fixes