Fixes for notification hubs