Merge pull request #1219 from kenliao94/misc_fix

[Misc] Various misc. fixes for Broker interface