Fix ServiceBus APIs to use correct behavior