Improve notification system
Final fixes to tasks before trying to deploy