Notify queue fixes