Fixed a few minor issues with messageBus.