Some fixes. Notification still abstract