Fixes for sending notifications