QA Fixes/debug

- Remove two invalid events
- etc fixes