Notify improvements and bug fixes