Some fixes and changes to save notifications