Fixes Out of Order Notifications

Fixes #2398
Fixes #2352

@sendhil may i bother you with a review?

Thanks!!