#649, #650, #651: Multiple notification hubs fixes