Try notifications
Fix build issues