Notification and QS improvements